added k and m
Merge branch 'master' of https://github.com/ETFernandes/SI2Repo