Changed lists to dictionaries
Merge remote-tracking branch 'origin'