Continuing Issue15
Continuing Issue15
Merge pull request #26 from WING-NUS/Issue15

Continuing Issue15