remove trailing spaces
add package name to docblock
Merge branch 'master' into maven