Release 0.2
merge