updated to 0.2.0, simpler api