v 0.3 - squashed commits