Merge branch 'master' of https://github.com/Cheatha/Cryptodisk

Merge