Merge pull request #1 from srmo/master

Find a better name for the Password/Encryption Dialog-button and small fixes