dtrebilco Merge pull request #19 from ForksMD/pr_compilation_issues