json error fix
Merge branch 'master' of github.com:eddies5/laser