Revert "bugfixes"
Merge pull request #3 from vahidhedayati/revert-1-patch-1

Revert "bugfixes"