.
resolved merge conflicts
.
Merge pull request #14 from jpark3000/fully_populate_userinfo

Fully populate userinfo