Allow data to be inserted using a dictionary and refactor existing code closes #458
Merge pull request #459 from tommarien/FB-458

Allow data to be inserted using a dictionary and refactor existing code ...