Merge pull request #1 from pyotrkoryakin/master

Some minor fixes
Doc template updates