joethorley Merge pull request #159 from poissonconsulting/b032