[Bug fixed] App works now directly the first time.
Merge remote-tracking branch 'github/master'