First commit of 0.5.1