Fix #31 Several backend issues
Fix #31 Several backend issues
Merge branch 'TasolJamal-fix_31' into develop
Fix code style issues