Merge pull request #202 from magnumripper/master