Merge branch 'item'
fixed error with prototype method
Merge master.