finally bugs fixed
Merge branch 'develop'