Merge pull request #1 from JanHorak/master

Update
Merge pull request #16 from TZ89/AES-Test

Merge pull request #1 from JanHorak/master