Merge pull request #17 from fatcerberus/master

SafeRefresh for file watchers was unnecessary
Merge pull request #18 from fatcerberus/master

Fix regression due to last patch