Updated with more tests
Merge branch 'master' into add_multi_tests
Merge pull request #44 from kwoodson/add_multi_tests

Add multi tests