Merge pull request #126 from peterlefanulumsdaine/master

Progress on several issues raised yesterday.