1.0.1 commit from dobriak

Lets try it with a 1.0.1 branch.