Compile fixes
Merge pull request #12 from ahcorde/develop

Compile fixes