Rewrite indicator path. Close #71
Merge branch 'enhancement-#71' into develop