Fixing some bugs
Merge branch 'master' of https://github.com/hft-swp/vcity.git