Momtaz 1.2.1-alpha, Fixes #28 #29