Merge pull request #21 from beardtree/master

Non-syntax changes