Merge branch 'ep.05'