Added support for 0.1.1