Minor adjustements to cope with NAs
Merge branch 'master' of github.com:thetaris/extralife