Swtich fixtures to marker and shorthand function
Update README