Map works standalone
updated Fields to UTF-8 chars
Merge remote-tracking branch 'origin/master'