Merge pull request #85 from Ishap/master

Emergency compile fix