Merge pull request #21 from magnumripper/ec