Merge pull request #45 from johnnyFiftyFive/master

DirectoryWatcher modifications
Infinite update bug fix
Ad hock
Merge pull request #46 from Explicite/explicite

Ad hock
Merge remote-tracking branch 'origin/master'
Infinite update bug fix