JSON marshalling support added
Merge pull request #2 from dhalupa/master

JSON marshalling support added and marshalling configuration refactoring