working on #9
Merge branch 'master' of https://github.com/aenima2/theyseemecarting