#19
#18
#18
#8
#8
#8
#18
#21
#9
#15
#9
#9
#17
Merge branch 'master' into Drizzy
#18
#22 - Preparing data to transfer to session 2