Adding OSX 10.7 support

Change-Id: I4d1bbee2e03185901f8f1311daab538d2139d597