Merge pull request #1 from inwish/version1

changes
Merge pull request #2 from inwish/master

Merge pull request #1 from inwish/version1