merge in changes from @wardpenney

Trying this again. Merge in changes from #10.