fix global env var, replace Map with List
Merge remote-tracking branch 'origin/master'