Fixed all the header problems, now it compiles!
Merge pull request #5 from KostyaKow/master

Updating