Closes #32 - Changed from id to build id in template