Made the app in using condition...
Merge remote-tracking branch 'upstream/master' into ra553
Merge pull request #639 from Rajia/ra553

Ra553