started a new function
stuff
text
some change
fixed bug
meged with master