Doesn't make it build yet
Merge pull request #1 from dirkgr/MakeItBuid

Doesn't make it build yet