Merging release 1.2.1 - Bugs Fixed

Release 1.2.1
 - Fixed #24 and #27