Merge pull request #3 from fifth5/develop

Merge pull request #2 from fifth5/master