fixed modelBase conflict changes
Merge pull request #20 from LarsHassler/model-base

fixed modelBase conflict changes