added JSON-support
added JSON-support