Merge pull request #2 from lundman/master

Complete the Cipher Solaris layer