Merge pull request #19 from yasselavila/develop

Separate global and local management modes