rm old code
Merge branch 'dev' into 793_fix
Merge pull request #218 from SBS-team/793_fix

793 fix