Fix list method
Merge branch 'develop'