Work on parsing Dictionary to our own data structure
Merge remote-tracking branch 'origin/master'