committing toArray fix
Merge branch 'Mike' into Min