Moved things from onResume to onCreate.
Merge branch 'master' of https://github.com/Propolandante/clarp_returns