Merge pull request #1 from claesn/master

update