Fixed so factory can accept lists as arguments.
Merge pull request #5 from rhewett/map_refactor

Fixed so factory can accept lists as arguments.