Fixing the wrong application start behaviour
Merge remote-tracking branch 'origin/master'