fix build system
Merge pull request #719 from enketo/master

fix build system
Merge pull request #720 from SEL-Columbia/master

fix build system