First commit of v0.5.3