Run parameters through filters before trying to serialize. Fixes #20
Code tidying
Add spaces to JSON files
Merge 1.0
Add spaces to JSON file