update branch with master bug fixes