include fixes
Merge pull request #21 from rezso/master

include fixes