Added option to shortcode to display 0 count
Merge remote-tracking branch 'origin/master'