Merge pull request #1 from mrichard/master

Merges upstream.
Merge pull request #2 from mrichard/master

Upstream changes
Removes unnecessary indentation in some templates.
Merge pull request #10 from juliomenendez/bugfix/removes-unnecessary-indentation

Removes unnecessary indentation in some templates.