Merge pull request #1 from MichaelCaraccio/master

Merge from MichaelCaraccio/Cryptographic-Algorithms/master
Merge pull request #4 from fa18swiss/master

Merge pull request #1 from MichaelCaraccio/master