Issue #3 fixing comments.