Added missing static keyword.
Fixed comments/static keywords.
Fixed @package.
Merge branch 'master' into ebsco