Merge pull request #1 from inwish/version1

changes