Password protection now optional
Merge branch 'master' into stahp