Fix #8
Merge branch 'master' into null-object