Fixed app.
Merge pull request #466 from MGhanem/fix_master

Fixed app.