fix: map needs to be set again
chg: updated test results due to changed primitiv_l.tst
Merge pull request #297 from mmklee/sync_master

Sync master