Merge pull request #2 from Kevindeving/master

Update