changed to linked hash map to preserve order
Merge remote-tracking branch 'origin/master'