Merge pull request #40 from myrle-krantz/develop

Fixing account creation to deal with a conflict exception.