update issue 129 branch to new master