Merge pull request #5 from tlycken/master

Roughly for arrays