feature/#6 done
Merge branch 'feature/#6' into develop