Feature/#5 improvements
Merge branch 'feature/#5' into develop