Small fixes
Fixed conflicts
Merge pull request #48 from Nekotekina/master

Compilation fix + other fixes