Fixed
Rewrited Template
Merge pull request #4 from diazGeoff/development

Development