Merge pull request #169 from magnumripper/onetwenty