Moving to freepastry 2.1