Merge pull request #14 from ZanSara/master

update
change name function
some work more
merged