Remove duplicated code
Improve the image look
Remove syntax errors
Merge pull request #292 from timschofield/develop

Develop