new map
Merge branch 'master' of github.com:icpcpp/edward