Added work under cold-start + some additional comments
Fixed the horribad merge conflict, hopefully...
Merge branch 'master' of https://github.com/mcmhav/muchBazar
Merge with newest commit