Fix #283
Merge pull request #284 from techhat/issue283

Fix #283