Release 0.5.2
merge conflict