Merge pull request #61 from eaburns/dev/eaburns

A couple of small fixes