Merge branch 'correct_halflife'