Fix Issue #1
Merge branch 'medic/1-make-problem'