Ready for release 0.007