304 bug fixed
Merge remote-tracking branch 'origin/develop'