Fix #21 Inconsistent Via is being generated

Inconsistent Via is being generated when a semicolon is present at the
end of original header
Merge remote-tracking branch 'origin/2.1'