Modified in preparation for version 1.0