Merge pull request #619 from Crapworks/master