[Fix #280] Remove references to $parent
Merge pull request #299 from k88hudson/280

[Fix #280] Remove references to $parent