Merge pull request #411 from Foggalong/master

Morning Mr. Freeman
Blue Shift & Opposing Force