Happy face!
Merge pull request #5 from anarchibald/master

Happy face!