Fixes #354
Merge pull request #368 from Landmine130/master

Fixes #354