Adjusted things to use changed basket library.
Merge pull request #22 from murrekatt/develop

Adjusted things to use changed basket library.