Merge pull request #348 from vikramrajkumar/master

Issue fixes
Fix wallet setting loading (#312)