fix display on empty data
fix PHP 5.3 syntax error
Merge remote-tracking branch 'origin/master'