Master

Completed and implemented features from issues #27 (closed) and #20 (closed). An example of #27 (closed) is shown in the yaml file and issue #20 (closed) is shown in the templates.py file.