Issue 225

re-based my patches and the patch from barry.wardell@gmail.com

This re-base needs to be tested, but by eye they look ok.