Fix the build
Merge pull request #1 from martin-g/master

Fix the build