cleaned up function chaining
Merge branch 'master' of https://github.com/yoshuawuyts/roulette