Rolled version in preparation for 0.3.0 development