Feature/issue 133

This one has been ready to go for ages --- I think I may have just forgotten to make a pull request.