Proper jbuiler handling
Merge pull request #9 from Plasmarobo/ProperJSON

Proper jbuiler handling