Merge pull request #364 from Gboster-0/oshan-man,-take-me-by-the-hand

Oshan changes return after the great mapper coma of everyone at once for some reason