changes in title 2.0 xD
merge resolved