PR 201 on develop

Somehow, #201 never got ported to develop.  This is everything from that PR except for one commit which was later reverted.