If we're going to be needing a dictionary, then give it a dictionary.
Merge pull request #5 from Qalthos/master

If we're going to be needing a dictionary, then give it a dictionary.