issue #1: Changing nil by NIL
Merge branch 'issue-1'