Merge pull request #6 from pveller/master

Basic support for template hierarchies and field types