updated fixtures
merge master