v1.6 - added ws templates, improved wp UserControl template