Merge pull request #247 from nathanweeks/issue/parent_id