Merge branch 'hotfix/v0.1.2-wording-clarification'
v0.1.2-wording-clarification fixes #2
This should fix the issues in #4
Merge branch 'hotfix/v0.1.3-forgot-my-password' into develop
v0.1.3-forgot-my-password fixes #4