tehn Merge pull request #1 from pq/patch-1