Added tests for outputting and parsing "null"
Minor improvements; added javadoc
Merge remote-tracking branch 'origin/master'