Changed some code, inspired by a Gr8conf talk.

http://gr8conf.eu/Presentations/Functional-Programming-in-Groo