Added failing test for array support
Changed the way the files property is processed

Now supports arrays and other such things
Add additional tests
Merge branch 'dallonf-master'