Stuff
Merge pull request #5 from adrianes/master-2

Stuff