v 0.4 - squashed commits