update
giMerge branch 'master' of https://github.com/mimoo/whiteboxDES