comma in the wrong place
missing static
Merge branch 'hotfix/1.0.2'

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