Noticed these while I was writing PR#170.
+1
Commit 1948158 is rebased to fix a trivial conflict with PR#170.
rebased onto eac88278daee726cfdb0a874a58e7b8ce33a68fc
Pull-Request has been merged by dcallagh
Noticed these while I was writing PR#170.