Resolution numbers corrected
Merge branch 'develop'

* develop:
  Resolution numbers corrected