Merge pull request #230 from magnumripper/master