Design changes.
Style.
Merge pull request #77 from rcnavarro/develop

Develop