passwords from properties
Merge pull request #503 from hhovsepy/master

ty