Fixed max image width
Merge branch 'develop'