Issue #1, added comments