Fixes #253
Merge pull request #262 from Tyroie/for-wreckedavent

Fixes #253