Merge pull request #2 from matchxxx/master

..