Added check for #59 and #56
Trying to add popupwindow