minor mods to be overwritten by pull
Merge branch 'master' of https://github.com/jeshuamaxey/phonekeyswallet