Merge branch 'fort/v0.3'
Fix Issue #1
Merge branch 'medic/1-make-problem' into develop