Pirop to nqpop #70

Merged
merged 18 commits into from May 30, 2012