fixed last image display bug
Merge branch 'master' into carousel