updates #2: Comment fix.
Merge branch 'issue-2' into develop