Merging pull request #183 #189

Closed chrispbradley closed 10 years ago