Fix and support now master branch