clean a bit
merge master