Update to 1.2.2
Merge pull request #54 from j0emay/master

Update to 1.2.2