move app.listen in before
Merge remote-tracking branch 'origin/master'