bug fixes
Merge branches 'master' and 'param' into param