v 0.2 - squashed commits