Release 1.2.1

Minor software release with some small fixes