Issue #41 - Add comments