Further improvements on feature #5
Merge branch 'feature/#5' into develop