Merge pull request #85 from bennychow/master

[BACKLOG-1768] Support for model changes starting with a hierarchy or me...
[TEST] Fix unit test.