add column number if it exists in message.
Merge remote-tracking branch 'phize/master'