json stuff added
Merge pull request #1 from kkleiven/master

json stuff added