Merge pull request #23 from vikramrajkumar/upstream

Chain server and wallet updates