Merge branch 'hotfix/1.0.1'

* hotfix/1.0.1:
  typos
comma in the wrong place
missing static
Merge branch 'hotfix/1.0.2' into develop

* hotfix/1.0.2:
  missing static
  comma in the wrong place