Merging Master into Reader DB

Bringing in master for the changes to the refactor_example so that we don't have to switch branches for that.