v0.02.3
NEWS update
merge conflict