Merge pull request #679 from Arantor/release-2.1

! As previously suggested, adding some more information to the popups fo...