Merging Eric's branch into master