Beta 1.8
Merge branch 'GitHub/Julian'