merge in changes from @wardpenney

This pulls in the changes from #10