Merge pull request #3 from mathis92/master

update