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