Merge branch 'joehillen/master' - pull request #381