Code cleanup
Again..
Merge branch 'master' into JSON