Merge pull request #41 from pq/0.2.2

0.2.2