Successful changed template
Fixed #32