Closes #21.
Merge pull request #47 from cthielen/master

Closes #21.