Adapted changes in master branch