merge changes from SlackBuilds.org