Merge branch 'feature/watcher' into develop

Fixes #5