Make info not shown if empty
Merge origin/master