Fixed bug #26 and moved field- and instance-definition in separate include files.
Merge branch 'master' into dev