Fixes #291
Merge pull request #979 from mynameistechno/master

Fixes #291