Merge pull request #1211 in master
Merge pull request #1208 in master
Fixing typos

Removing curly brace + semicolon from array
Merge pull request #1216
Merge pull request #1216 in develop