some new changes from ivantsoft
Merge branch 'master' of https://github.com/karlsson82/java1