v 1.0 - squashed commits