merge changes from Slackbuilds.org