updated to master branch for all frameworks