Merge pull request #26 from benfoster/dev

Merge with dev