Adding tests and fixing code based on results
Merge branch 'master' of https://github.com/apic6/MELT