support for changing email addresses; closes #158
support for changing email addresses; closes #158
Merge remote-tracking branch 'origin/dev'