fix express
fix watch
Merge branch 'develop' of https://github.com/bitdewy/magpie into develop
Merge pull request #7 from bitdewy/develop

merge dev to master