Add optional ability to specify password as 5th argument.
manually merging silver changes to savi-2.0