adding json syntax
Merge branch 'master' of https://github.com/akandels/akandels-linux
merging in