json bug removed
Merge branch 'master' of https://github.com/askz/dsk