Merge pull request #72 from leppa/listmodels

Improvements and refactoring (towards #62)