reverting to working state
Merge pull request #4 from ngbinh/master

reverting to working state