resubmit
Merge pull request #36 from joeyzhang1989/master

resubmit-to fix the revert