Fix bevry/projectz#49 and bevry/projectz#45
Merge pull request #50 from balupton/master

Fix bevry/projectz#49 and bevry/projectz#45