Merge pull request #200 from Nekotekina/master

Compilation fixes