Fix infinit recursive call
Merge branch 'programmic_usage' into develop