added features and methods to list
Merge branch 'master' into model