revert #158
Merge pull request #161 from samsonasik/rev-158

revert #158
Merge branch 'hotfix/161'

Close #161