emacs c style
merge dev