Fixed map-parser for use with Highcharts 3
Merge remote-tracking branch 'origin/master'