Merged changes from post on Monkey community forums

These changes were originally summarized by DrT on the Monkey community
forums.

http://monkeycoder.co.nz/Community/posts.php?topic=4760