Merge pull request #2 from bplatta/template-main

Template main