Slightly modified by Marton Balint to produce valid json as well.
Signed-off-by: Marton Balint <cus@passwd.hu>