1.0.1 commit from dobriak