Fixed crash during onResume
Merge branch 'master' of https://github.com/rhnoble/oldperson