Fix list
Add parameters.
Merge remote-tracking branch 'timlinux/master'