Merge branch 'master' of github:patyx7/Zdrestr