null bug fixed
Merge branch 'origin/dev'