build fix
debug build fix
Merge pull request #19 from fr500/master

Build fixes