Fixed app
added the auto return
not sure
Merge remote-tracking branch 'origin'