Added Lion (10.7) compatibility