Fixed duplicate shelf creation issue.
Merge pull request #364 from sheebans/master

Fixed duplicate shelf creation issue.