Revert "Merge pull request #6 from doin/master"
Merge pull request #11 from doin/revert-9-master

Revert "Merge pull request #6 from doin/master"