merge session 4 into master