Fix botched merge
Merge pull request #142 from lorenzhs/merge

Fix botched merge