Merged with Travis and Yaphet

Completed Merge