Fixed bug which was adding separator when it shouldn't
Merge remote-tracking branch 'origin/dev'