First commit, v a4

Signed-off-by: Chris Lüscher <c@ia.net>