added author annotation
Merge branch 'javaparser'