whoami changes.
Merge pull request #65 from git-harry/sprint

Merged automatically by jenkins after successful gate test
remove unnecessary arg
pep8
Merge pull request #66 from hughsaunders/sprint

Merged automatically by jenkins after successful gate test