Merge pull request #135 from timwindsor/master

Adds Pawel Hofman
Merge pull request #136 from timwindsor/master

Adds Janelle Hinds
Adds Simon Hsu