Changes up to 0.5.1
v0.5.1