Fixed #80 (img tags were not properly closed)
Merge remote-tracking branch 'origin/development' into development