Merge pull request #204 from Classicmods/master