Merged Changes

Flo,

I just merged the changes from your fork to my github! I will look over the rest of the changes that you have sent along this weekend.

Thanks
Jake Rutter