Merge pull request #23 from hermanussen/master

Auto-deserialization of base templates + small fix for standard fields