revert back issue #35
Merge pull request #63 from AmirolAhmad/master

revert back issue #35