Merge pull request #46 from guywithnose/master

lost of things
fix fips