Revert "Merge pull request #26 from k22mak/develop"

This reverts commit d1a3f81cdf3db508cdf5a2d71c5792bc97c2aec3, reversing
changes made to f78d306c573b5de516caa62810192f9f82cd677c.