flakes's changes

Signed-off-by: Andrew R <andrewreds@gmail.com>
Merge branch 'master' of github.com:sachalegrand/design-b into master2