Merge pull request #12 from ImMrSn/develop

Merge pull request #11 from ImMrSn/master
Merge pull request #13 from ImMrSn/master

Merge pull request #12 from ImMrSn/develop