incorporating pull request 63

This looks like a tone of commits, and it is, but check out the actual differences between this branch and master and you'll see they are minimal.  I made changes then changed them back with additional commits rather than reverting.