fix #59
close #58
close #57
Merge branch 'feature/wait' into develop
Merge branch 'feature/logenh' into develop
Merge branch 'feature/fsenh' into develop