Expand dictionary
Fix indentation
Merge pull request #1 from richard1/master

Expand the "dictionary"