Issue #10: resolving conflict from merge

I broke the build when merging my various pull requests.