- some small modifs
Merge remote branch 'origin/master'

* origin/master:
  - Add detectorMaxWidth/detectorMaxHeight attributes - Remove flipX/flipY attributes