gustafn
committed
on 27 Aug 14
- use dicts to avoid extra arrays