Should be the last step to finishing #303
Merge pull request #332 from WriggleNightbug/master

Fixing maybe #303?