this is the v2
Merge pull request #3 from woorea/master

the changes are ready