template added to package
added tests
cleaning blank lines and trailing white spaces