Merge pull request #116 from 4Vs/master

NO REV REQ: Insert of Userpic # Thanks