Merge pull request #2 from TimothyXL/master

t
Merge pull request #37 from BouwenJ/master

Merge pull request #2 from TimothyXL/master