Update to v 1.2.1
Merge pull request #51 from j0emay/master

Update to v 1.2.1