5ecd9840aebbd41ef8383be3b1b86c33b91f4894
Resolves: #257
rebased onto eb05988cb0c90c691e9c23b2885bf30cf14bec41
Commit 4e86c97e fixes this pull-request
Pull-Request has been merged by amoloney
Resolves: #257