Merge pull request #6 from jwill/master

Addresses errors reported in gdg-x/generator-boomerang#5