make output and definition
update version
Merge branch 'develop'