allow for renaming of models
fix command line args
Merge branch 'develop' into feature/issue-11-rename-models
Merge branch 'feature/issue-11-rename-models' into develop