Merge pull request #167 from qiangdavidliu/2.x

Initial naive implementation of InstanceLocation