Merge pull request #67 from mehlis/master

Fixups: build with debug enabled