Modify for analysis #73
Merge branch 'fix/#73' into develop