Merge "Yangman - improvements"