Merge pull request #283 from vasily-kirichenko/master

Optimize file system watching
further optimized the file system watching