Merge pull request #3 from rustyswayne/master

Worked out some issues with the basket.