NotSoFlat: bugfixes and api tweaking
Tweaks
NotSoFlat: more tweaks
Merge branch 'NotSoFlat-dev' into dev

* NotSoFlat-dev:
  NotSoFlat: more tweaks
  Tweaks
  NotSoFlat: bugfixes and api tweaking
Merge branch 'dev'

* dev:
  NotSoFlat: more tweaks
  Tweaks
  NotSoFlat: bugfixes and api tweaking