+ separator managementt
Merge branch 'master' of https://github.com/xrubio/pandora