enigmatologist

Noun

 * 1) A person who creates or studies puzzles.