Defined passwords

* #118 rebased on top of the latest master