changed templated and type attributes and fixed curies
fixed tests
Merge pull request #14 from amakhnach/master

changed templated and type attributes and fixed curies