Update to start working with both arrays and dictionaries
Merge pull request #1 from zdrossman/master

Update to start working with both arrays and dictionaries