Merge pull request #3 from woorea/master

the changes are ready
this is v3