Feature/update for 0.8

Update for 0.8 beta.1