Supporting 10.7

Fixes #5