Fixed json parsing in config.py
Merge remote-tracking branch 'origin/master'