expire field can now be null
Merge branch 'master' of https://github.com/brightja/hazzard