compiles now
Merge pull request #1 from mitkniL/master

Compiles now