pq Merge pull request #1 from pq/fixed_imports