Merge pull request #32 from ropalka/1.2

A couple of fixes
Prep 1.2.3.Final
Next is 1.2.4.Final
Prep 1.2.4.Final
Next is 1.2.5.Final