merge lavender 0.1.14