Issue #44 removed @todo comment corresponding to the resolution of this
issue.
Merge pull request #62 from carlosmiranda/44

Issue #44 removed @todo comment corresponding to the resolution of this