Codebase synchronization with Krypt 0.0.2.rc1
Merge pull request #1529 from abstractj/krypt-0.0.2.rc1

Krypt 0.0.2.rc1 update