Minor tidying & set as v1.0.0