fix a few bugs in the last recipe - not working
Merge remote-tracking branch 'origin/master'