Merge pull request #1 from ukdtom/tommy-work

Tommy work
Merge remote-tracking branch 'upstream/master' into tommy-work
V0.0.0.4 See changelog
Merge pull request #7 from ukdtom/tommy-work

Tommy work