merge from devvel, push to 0.0.10 -dye