Update to 0.1.2 and decor 0.2.1