support new protocol: arrays -> objects
Merge pull request #317 from nelenkov/dev

support new protocol: arrays -> objects
some cleanup
Merge pull request #318 from nelenkov/dev

some cleanup