Revert "Merge pull request #19 from commi235/develop"
Merge pull request #21 from commi235/revert-20-master

Revert "Merge pull request #19 from commi235/develop"