Merge pull request #60 from jcarlosgarcia/issue-42

Issue 42
Guidelines and styles added