Master github

This is an update for the new OS.