Make options.base an array before assigning directory
Readability tweaks
Merge pull request #45 from tschaub/patch-1

Make options.base an array before assigning directory