Last minute fixes
ok
Merge branch 'master' of https://github.com/Kipke/NodejsApp1