Fix disposing of file system watchers (closes #590)
Merge pull request #595 from ovatsus/master

Fix disposing of file system watchers (closes #590)