Merge pull request #956 in master
Fixed missing ')'
Merge pull request #960
Merge pull request #960 in develop