Released v2.0 beta

Re-write of the code which now supports dynamic templates