make me collaborator
clean the code
merge upstream
Merge pull request #1 from antonydenyer/master

Not making @antonydenyer a collaborator but thanking him for his work...