Merge pull request #7 from icarus-allsorts/master

Tempest 11
Merge remote-tracking branch 'upstream/master'