Merge pull request #334 from triceo/one-nine-five

Never prompt for password if it was passed as an argument (fixes #195)