updated to 0.3.0 branch changes