fix this crap
Merge branch 'fix-main-image' into development

* fix-main-image:
  fix this crap
fix callback
Merge branch 'development'

* development:
  fix callback
  fix this crap