Develop

Merged in Stephen's pull and the fix for the invisible mouse.