Revert "Merge pull request #105 from mubaidr/master"

This reverts commit 08e5a756b78cf3cbb7112a23f572eaa36b3656f1.