Closes #293.
Merge pull request #295 from standage/master

Closes #293.