Changed data type from array to mixed
Merge pull request #7 from timoschaefer/1.0

Merge branch '1.0'