Added metric system support
Merge pull request #1 from shaundon/master

Added metric system support