Adding test for nulls
Correcting indentation
Merge branch 'upstream/master'

* upstream/master:
  Adding test for nulls Correcting indentation