Merge pull request #1 from philipz/master

update from philipz