Made keeping the ipython notebooks up to date easier by using  and
Updated for new return structure in generators