Adding support with 10.7+, issue #16