Fixed bug with new info windows
Added templates
Fixed typo
Merge pull request #39 from rocketfish/infoBug

Added templates