Develop

merge in recent changes