still trying to fix merge problem...
Merge pull request #34 from jblowe/master

NOJIRA: repair code damaged by attempt to deal with merge.