Merge pull request #237 from ovatsus/master

Fix disposing of FileSystemWatcher
Merge pull request #238 from ovatsus/master

Fix disposing of FileSystemWatcher (fixes #236)
Fixes #235