corrected a mistake in models
Merge branch 'master' into map_support