Merge pull request #22 into master. Also closes #23.