Merge pull request #13 from bmork/dictionary-updates