Merge pull request #522 from Maaack/rewrite-butler-shell-script