Did some more work, of course...
Merge branch 'master' of github.com:ianaldrighetti/lmmvc