Close #40 and fix some data
Merge branch 'enhancement-#40' into develop