Fixes separators
Merge branch 'fix/seperators' into develop

* fix/seperators:
  Fixes separators