Updated with comments

As seen in issue #2.