Marvel to finally collect Master of Kung Fu