Allowing for json examples as well; Bug fixes