Merge pull request #168 from magnumripper/onesixfour