merging master into marybeckman fork