Merge pull request #5 from thomasE1993/master

Update