Merging tnichols into master