Close #40, close #41 and close #42. Also starts rankig repository
Merge branch 'enhancement-#40-#41-#44' into develop
Fix merge issues