data structures rev1
Merge branch 'master' into modelloading