simplified dict. Prep for end-to-end solver
Merge remote-tracking branch 'origin/master'