merge branch figaro v0.2 complete