More JSON-Friendly
Merge pull request #1 from dankogai/master

Just one more line to make it JSON-friendly