Master merge

there are required/necessary improvements from graz's repo upstream