Merge pull request #1 from thomasfl/master

update