Final implementation and comments
Merge pull request #40 from vasouv/json

Final implementation and comments