Merge pull request #217 from magnumripper/master