Fix #175
Merge branch 'dev' into two-factor-auth