Template Upgrade

Added #include and #each
Updated Documentation
Fixed typo