7.x 2.x

Fixes #22