Merge pull request #347 from JamesB7/master