Merge pull request #16 from gregerg/master

Let's test this!