route modification
fix merge conflicts
Merge pull request #25 from paulhyunkim/tsangbranch

Resolved conflicts