More good stuff
Merge pull request #74 from tfgit/master

More good stuff