Save some parsing
Undo debugging comment
Merge pull request #3 from jvazquez-r7/review_2878

REVIEW 2878