Merge pull request #4 from EwanDobson/master

Ololo