Fixed broken structures

Signed-off-by: Peter Menke <pmenke@googlemail.com>
Merge branch 'master' of https://github.com/sfb673/mexico-testcorpus

Conflicts:
	mexico/resources/mexico.toe

Signed-off-by: Peter Menke <pmenke@googlemail.com>