Merge pull request #1 from RainerKuemmerle/master

update