Ready for version 0.5