Removed length from make(map[]) because redundant.
Merge remote-tracking branch 'origin/master'