Switched to GSON JSON library as dependency. Refactored code to accommodate.
Merge remote-tracking branch 'origin/master'