Changes from 0.4.x to 0.6.x

FIXME Only a draft version, must be enhanced.