Add child tags - Fixes #118
Merge pull request #119 from theponti/add-child-tags

Add child tags - Fixes #118
Merge pull request #120 from theponti/develop

Develop