Fix for undefined when 0
Remidner Popup is now filed
Merge remote-tracking branch 'origin/master'