Merge pull request #36 from mubassirhayat/master

GCM Modifications