Merge pull request #47 from pauldhunt/master

Version 1.017