Fixed issue #4, added getpass option