Update to 1.2.3
Merge pull request #22 from chatellier/master

Update to 1.2.3