Feature: Better error handling with numeric/string collision during conversion
Merge remote-tracking branch 'origin/master'