fixed
removed uncommented code
Merge branch 'dev'