Merge pull request #1786 from FernetMenta/addongui