Added images, added a update function
Merge remote-tracking branch 'origin/master'