Full commit of version 0.5