Issue #7 Fix remarks