Merge pull request #1180 from Stevoisiak/Replace-GCM-With-ISO Replaced GCM functions with ISO functions
