Merge branch 'master' of lenovo.local:git/hs-java