enigmista

Etymology
From.

Noun

 * 1) a maker, or an enthusiast of, puzzles, rebuses etc.