Fixed bug
Updated complete status
Merge branch 'develop'

* develop:
  Updated complete status
  Fixed bug