Update to use MultiDictionary
Merge pull request #1 from Petermarcu/development

Update to use MultiDictionary