Fixed inherent hierarchy issues
Merge pull request #25 from Lycanstrife/master

Fixed inherent hierarchy issues