update to 0.5.0 API, bump version -> 0.3.0
resolve merge conflict