Creating template
merge github master