Corrected parent/child relationships
Merge pull request #6 from mottosso/master

Corrected parent/child relationships