Updated return function
Merge http://github.com/tallenn/Frizza