added market checking
Merge branch 'master' of https://github.com/gtsui/singtel_hackathon