Merge pull request #14 from OceanLabs/master

Minor tweeks
Reworked the comments on Template class.
Merge pull request #15 from OceanLabs/notes

something
Merge pull request #16 from OceanLabs/Backup

Merge pull request #14 from OceanLabs/master
Merge pull request #4 from OceanLabs/master

Update my own
Update to comments
Merge pull request #18 from victor-baumbach/master

update High level doc strings
few improvements to dicts