merge from upstream, prepare for 0.1 release