New data in json + some fixes
Merge pull request #112 from uCtrl/newJsonFile

New data in json + some fixes