Merge pull request #61 from hzeller/fix-compilation

Fix compilation