Working on Update function..Still not complete
Merge remote-tracking branch 'origin/master'
Hunter little fixed