Merge pull request #11 from LarsHassler/base-model

Base model
Merge branch 'master', remote-tracking branch 'origin/master' into base-model