add figaro
set make up
add conditions
fix make_up
Merge branch 'feature/make_up' into develop

* feature/make_up:
  fix make_up
  add conditions
  set make up