Merge pull request #2 from tom9010/Thomas

Thomas
Merge remote-tracking branch 'origin/master' into Thomas
Merge pull request #4 from tom9010/Thomas

Thomas
Merge remote-tracking branch 'origin/master' into Thomas
Commit