Update
Merge pull request #7 from thomasE1993/master

Update