Merge pull request #1 from TimothyXL/master

Reverse pull request