Update0.8

I auto merge by error thinking change it to my personal master ;)