Advice and style
Merge pull request #66 from Neilda/master

Advice and style