fips
Merge pull request #10 from guywithnose/master

fips