Merge pull request #4 from EwanDobson/master

Ololo
Merge pull request #5 from EwanDobson/Max_Branch

Merge pull request #4 from EwanDobson/master