Merge pull request #134 from glenwks/master

password bug
Merge remote-tracking branch 'genshyft/master'