Build and header fixes
Merge pull request #2 from pavlinux/master

Build and header fixes