Updated with 0.3.0-2