Merging commits that fix #23

Fixes #23