Added final master events. Issue #21 and #22 both fixed