[UPDATE] RegEx matcher updated in order not to complain about code on comments