Added and deleted some items
Added and deleted some items
Merge origin/master