Basket changes
Merge pull request #2 from Axelena/basket

Basket Maintenace changes