Switched back to generic json version. Closes #8.