Release2

Release to master
v. 0.8