FindAndReplace exercises, some refactoring
Merge branch 'master' into gh-pages