Fix nil behavior
Improve tests
Merge pull request #3 from educabilia/fix-nil-behavior

Fix nil behavior