Merge pull request #1 from tfmorris/master

A bunch of new features
Merge remote-tracking branch 'upstream/master'