Fixes #294
Merge pull request #296 from benjello/dev

Fixes #294