release 0.2
merge