Merge pull request #74 from epicstar/master

Merge pull request #2 from rectangle-dbmi/master
Merge remote-tracking branch 'upstream/master'