Changed some refs to arrays and hashes
Merge pull request #93 from jbeast/fix_for_my_tests

Changed some refs to arrays and hashes
Prep for release 0.30