updated fixture
merge master