Added note on switching function parameters
Merge branch 'v2.0'