Added JSON support
merged komachi json