Updating to r4
Merge branch 'pr/7'