bugs everywhere..
Merge branch 'master' into slow-working
should be a bit faster