Replace nil check with noneornil (#14)
Merge remote-tracking branch 'origin/master'