This commit fixes #21

This commit closes #21