Merge pull request #1228 in master
Merge pull request #1228 in master
some typo
removed unneeded parenthesis
another fix for better readability
revert as per @Maks3w
Merge pull request #1230
Merge pull request #1230 in develop