changes for 0.8.0.0
more work toward v0.8.0.0
avoid big block if
merged changes from my-password-is-password/httpswitchboard@a93530dfeaa9eb36ad29638b2365c6b1473145c8
latest version