Update to version 1.0.5
Merge pull request #3442 from kevinkirkup/master

Update to version 1.0.5