Merge branch 'master' of https://github.com/maxmara/oConfig

Conflicts:
README.md