Merge pull request #1 from mathis92/master

update