Returning an array and simplifying
Merge pull request #4 from evert/master

Returning an array and simplifying