some minor changes
Merge branch 'master' of https://github.com/apic6/MELT.git
Essay, not finished
Merge branch 'master' of https://github.com/apic6/MELT.git