well, indeed, I don't completely agree with this pull request. You are doing unit conversion in the model, while this probably should be done in the templates.