Nig devs

merge local from master