added several small function for conversion of measures
Merge remote-tracking branch 'origin/master'