Fixed Bug: 1042112

I have tried to incorporate the feature mentioned on bugzilla about taking password argument from a file . 
Note: Use spaces for indentation, not tabs. Also, this forces the use of a file, which is not ideal. The file should be optional, and is not limited to just the password.