fix default value
clean up source by the PHP_CodeSniffer
fixed version
Merge branch 'develop'