changes to master

added changes up to 0.8 to master