Almost ready for v1.1!