Add password protection and error strings
Merge pull request #17 from droidplus/master

Add password protection and error strings