Change some array references to arrays.
Merge pull request #3 from colomon/master

Fixes fatal errors