Some changes, project now compiles fine under windows and linux :)