Ready for version 0.4