Fix compilation and runtime, probably broke others things!
Merge pull request #14 from Kenny9999/master

fix bad merge