Merge pull request #2 from TimothyXL/master

t