Merge pull request #148 from jamiedigweed/master

Update to current
Devs cant see msay anymore.
Merge pull request #150 from jamiedigweed/Jamie

Jamie