add author
merge dev add author