merged upstream, fleshed out json array
Merge pull request #9 from peoplemerge/master

merged upstream, fleshed out json array