Close #51 and fix #52 by restoring teh previous data
Merge branch 'enhancement-#51' into develop