Fixes #85
Merge remote-tracking branch 'author/master'
Test case for #86