+ Fixed images
Merge remote-tracking branch 'origin/master'
+ fixed some more stuff