Merge pull request #3 from xonhu/master

a