Updated to track git :master. Not completely tested.