fixed docblock
Merge branch 'master' into example-app