Merge branch 'fixAuthor'
Merge branch 'RemoveHaveItem'