Fixed some errors, an added the ability to calculate on the result

This change makes inputs like 25cm*3 to m a valid input
Merge branch 'master' of https://github.com/boh1996/salmon