[0.3.2] added {{name}} variable, and did some cleanup