fixes #60
Merge remote-tracking branch 'upstream/master' into account-manager