Adding crypt utility
Merge branch 'develop'