Fix regexp & escape double quote

ref #37
Merge branch 'update-vital-over' into dev