Fix up the findElement() recursion
Clean up configurations, add watch task.
Merge remote-tracking branch 'github/master'