Handle more items and better orginazation
Merge pull request #1 from sedrik/better_item_parsing

Handle more items and better orginazation