fixed int parameter
Merge branch 'master' into develop