issue 1 branch active

merge to master