Fix #18 - toJSON
Fix #8 - no-freeze