refactoring 2: electric bugaloo
Merge branch 'master' into teddy/refactoring