Merge pull request #36 from JRogaishio/develop

Develop
Updated to version 0.2.13-alpha