Merge branch 'master' of https://github.com/CipherHat/MELT.git