update README
Merge branch 'fsm' into dev
Merge branch 'dev'