Add return 0 to app helper
merged refactor branch to master