1.2.1
Merge pull request #26 from ezrpg/development

1.2.1