Added Solaris support