Adresses #311 - Fixed response format problem.