Merge branch 'eapi'

* eapi:
  Allowed input of username and password
added the optional use of -n

added the ability to use -n if needed, this is optional and not
required.
Merge branch 'master' into eapi

* master:
  added the optional use of -n