Merge pull request #12 from DarkAiR/master

Base template