Get rid of outdated comments.
Add comment pointing to issue #18