MD5 encryptie
Code cleanup
Merge origin/master