Updating tool to support JSON format
Resolves #13