Allow nulls
Merge branch 'superfast' of https://github.com/TremayneChrist/Based