bug resolving changes
Merge branch 'master' of https://github.com/kalai-iksula/starbazaar
bug resolving changes