Fixes #261
Merge pull request #262 from deanberris/0.9-devel

Fixes #261