Added filesystem watch example
Fixup file watch example
merge from upstream