Merge pull request #137 from timwindsor/master

Adds Simon Hsu