added space after cast
Merge pull request #1038 in master
Merge pull request #1040
Merge pull request #1040 in develop