[ #3 ] solve problem1 with Trampoline
Merge branch 'feature/issue/3' into develop