Fixed short image.
Fixed broken image.
Fixed JSLint errors.
Merge remote-tracking branch 'upstream/master'