Issue #77 removed @todo puzzle comment.
Merge pull request #125 from carlosmiranda/77

Issue #77 removed @todo puzzle comment.