Merge pull request #12 from ImMrSn/develop

Merge pull request #11 from ImMrSn/master