Merge pull request #227 from pranavparikh/master

Allowing to pass capabilities as JSON object, merging default capabilities with user defined capabilities
Merge remote-tracking branch 'upstream/master'