Close #7
Add comments