Revert "Merge pull request #14 from rednaz/development"

This reverts commit 75013ad005029fb2a3bec6a70298919bb740acf1, reversing
changes made to 70d2d33290c10adaa0345df9fae48e5784c04d93.
Merge pull request #15 from rednaz/revert_dev_merge

Revert "Merge pull request #14 from rednaz/development"