Merge pull request #13 from sjanc/build_fix

Fix build with master