- Partial check-in for v1.1 branch.  Fixed Issues #32, 31, 26 fully.  Working on the rest later...