Fixed javadoc issues (strange that project checker didn't catch it during verify phase)
Added test and fix for the case if there is a semicolon between import statements.