Add state to comments

It closes #20