Stuff
Merge branch 'origin/master'
Merge pull request #4 from Spyobird/master

Commit