Improve parsing of arrays
Merge pull request #37 from r-e-d/master

Improve parsing of arrays