Revert "Merge pull request #98 from vishalmelmatti/master"

This reverts commit 6fad72dd66b54bd85cf77208fad9d20e89f1999f, reversing
changes made to bd1e7086a4ce06ea0896f4588de454d1aec5480f.

issue #101