Refactor mapping code into OO
Merge branch 'master' of github.com:kaixiong/sghazecrowd