Merge pull request #1 from ncoutinho/master

[merged]Remo merge this
refactored convert added conversion factor