spaces indentation
image offset feature restored
Merge branch 'master' into gh-pages