use new format of params string now
Merge remote-tracking branch 'origin/master'