Following best practices
Merge pull request #1 from schickling/patch-1

Following best practices