This commit fixes #18

This commit closes #18