Feature/#4 done
Merge branch 'feature/#4' into develop