Merge develop branch

- New internal parser and writer structure
- Properties are written out the way they come in
- Better handling for json validation on parsing