Updated Pablo Vazquez's amaranth toolset to 0.3