Fixes for nil stuff
Merge branch 'master' of https://github.com/xidernm/cc5k