Merge pull request #5 from brtz/develop

Develop
Merge pull request #6 from brtz/develop

[CHANGE] renamed config.py to config.example.py
Merge pull request #7 from brtz/master

Merge master back into develop;