Merge branch 'modifications'