Merge pull request #113 from bitol-io/jgperrin-patch-1