Created by: lbartoletti
Fixes #51 (closed)
maybe it's worth to check everywhere where there is this dict?