Minor fix
Use fs.watchFile instead of fs.watch to avoid watching issue
Merge branch 'develop'