a couple new model methods
Merge branch 'master' into logviewer