Merge pull request #501 from Maaack/continue-setup-window