Adding a couple of suggestions, and fixing invalid json
fix merge conflicts
Merge branch 'blakehall-master'