Merge branch 'master' into eapi

* master:
  added the optional use of -n
renamed suffixes to KB, GB and so on