Merge pull request #3 from matchxxx/master

..