Fix refactoring bug
Adapt examples
Reindex
Merge branch 'master' of https://github.com/nate-parrott/Flashlight
Fix conflicts
Merge branch 'larcus94-master'