class names corrected
Merge branch 'master' of https://github.com/bspadm/java-sources
commit from gws