Merge pull request #254 from standage/master

Closes #253.