Merge pull request #1 from BorisVerk/master

item based