Merge branch 'master' into toobig
Put var initialization in __init__