Merge pull request #189 from chrispbradley/master

Merging pull request #183