Fixes issue U4-2708
Merge pull request #181 from Attackmonkey/Tim-Payne-Hackathon-U4-2708

Fixes issue U4-2708