Code formatting and JSON maps
Merge pull request #61 from dreamteam69/master

Code formatting and JSON maps