Fixed return type and parameters attributes in function declaration/definition.
Merge branch 'master' into test